auto merge of #408 : alexcrichton/cargo/fix-master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 19 Aug 2014 18:54:07 +0000 (18:54 +0000)
committerbors <bors@rust-lang.org>
Tue, 19 Aug 2014 18:54:07 +0000 (18:54 +0000)
commitdb0365978285e590e942cbf62266f540f7f4470c
treec0f2e183076026e2a9f6c1392269a27c383c1e82
parentcc4dadfebe5b010aeac02a95d9572ac8a5d739fd
parent1aeebfd71f3729374079664a990b9711eaedb600
auto merge of #408 : alexcrichton/cargo/fix-master, r=alexcrichton